Improve flexibility